Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add topology applications #1975

Merged
merged 24 commits into from
Sep 30, 2024
Merged

Conversation

Kiryous
Copy link
Contributor

@Kiryous Kiryous commented Sep 19, 2024

Closes #1968

  • Frontend: Create/manage application form
  • Frontend: Create application node and add child services to draw on react-flow
  • Backend: CRUD
  • Backend: Tests
  • Frontend: update hooks to work with actual endpoints
  • Frontend: ensure useTopology() hook doesn't cause multiple polling
  • Docs

Copy link

vercel bot commented Sep 19, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Skipped Deployment
Name Status Preview Comments Updated (UTC)
keep ⬜️ Ignored (Inspect) Visit Preview Sep 30, 2024 10:40am

@Kiryous Kiryous marked this pull request as draft September 19, 2024 16:48
@talboren talboren changed the title feat: add topology applications UI (mocked API for now) [wip] [WIP] feat: add topology applications UI (mocked API for now) Sep 19, 2024
# Conflicts:
#	keep-ui/utils/hooks/useTopology.ts
@Kiryous Kiryous changed the title [WIP] feat: add topology applications UI (mocked API for now) [WIP] feat: add topology applications Sep 23, 2024
@Kiryous Kiryous changed the title [WIP] feat: add topology applications feat: add topology applications Sep 26, 2024
@Kiryous Kiryous marked this pull request as ready for review September 26, 2024 22:58
@talboren
Copy link
Member

@Kiryous please note that build fails
Module not found: Can't resolve '../topology/map/ui/topology-page'

@Kiryous
Copy link
Contributor Author

Kiryous commented Sep 28, 2024

@talboren fixed

@talboren
Copy link
Member

@talboren fixed

now e2e tests failed (db couldn't start for some reason ;()

@talboren
Copy link
Member

@talboren fixed

now e2e tests failed (db couldn't start for some reason ;()

@Kiryous
keep-backend-1 | raise util.CommandError(multiple_heads) from mh keep-backend-1 | alembic.util.exc.CommandError: Multiple head revisions are present for given argument 'head'; please specify a specific target revision, '<branchname>@head' to narrow to a specific head, or 'heads' for all heads

Seems like there were some migrations since you created this branch and your migration is out of date.

@Matvey-Kuk
Copy link
Contributor

If I try to create an Application while not having any topology, clicking "Create Application" button don't do anything:
Screenshot 2024-09-29 at 15 55 34

@Matvey-Kuk
Copy link
Contributor

Updating existing App, adding new service to it, getting error:
Screenshot 2024-09-29 at 16 10 11
Screenshot 2024-09-29 at 16 10 18

@Matvey-Kuk
Copy link
Contributor

"Show on the map" feature doesn't work for me if nodes are far from each other vertically. It positions the view in between and the view is too zoomed-in to show all services for the app.

@Matvey-Kuk
Copy link
Contributor

Maybe enable filter if I click "Show on the map"? Filter works well.
Screenshot 2024-09-29 at 21 12 14

Copy link
Member

@talboren talboren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@talboren talboren enabled auto-merge (squash) September 30, 2024 10:40
@talboren talboren merged commit f06625e into main Sep 30, 2024
11 of 13 checks passed
@talboren talboren deleted the feature/1968-topology-applications branch September 30, 2024 10:40
Copy link

codecov bot commented Sep 30, 2024

Codecov Report

Attention: Patch coverage is 76.00000% with 12 lines in your changes missing coverage. Please review.

Project coverage is 31.42%. Comparing base (ab4b44a) to head (dc585ff).
Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
keep/api/core/db_utils.py 18.18% 9 Missing ⚠️
keep/api/models/db/topology.py 94.59% 2 Missing ⚠️
tests/conftest.py 50.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##             main    #1975       +/-   ##
===========================================
- Coverage   69.95%   31.42%   -38.54%     
===========================================
  Files         150       57       -93     
  Lines       13297     5980     -7317     
===========================================
- Hits         9302     1879     -7423     
- Misses       3995     4101      +106     
Flag Coverage Δ
31.42% <76.00%> (-38.54%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[➕ Feature] Allow to group services into applications in topology
3 participants